From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 11 Mar 2015 21:11:25 +0000 (+0100)
Subject: calendar: Add public close() method
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1511
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b61cb920533e04;p=gnome-shell.git

calendar: Add public close() method

Currently a message can only be closed by its close button. However
as we want to make a section's clear action synonymous with clicking
the close button of each individual message in the list, we will need
to expose the close action, so add a corresponding method.

https://bugzilla.gnome.org/show_bug.cgi?id=746027
---

diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index af349665b..dda733c7c 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -1017,16 +1017,17 @@ const Message = new Lang.Class({
         this._bodyStack.add_actor(this.bodyLabel.actor);
         this.setBody(body);
 
-        this._closeButton.connect('clicked', Lang.bind(this,
-            function() {
-                this.emit('close');
-            }));
+        this._closeButton.connect('clicked', Lang.bind(this, this.close));
         this.actor.connect('notify::hover', Lang.bind(this, this._sync));
         this.actor.connect('clicked', Lang.bind(this, this._onClicked));
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
         this._sync();
     },
 
+    close: function() {
+        this.emit('close');
+    },
+
     setIcon: function(actor) {
         this._iconBin.child = actor;
         this._iconBin.visible = (actor != null);
@@ -1158,7 +1159,7 @@ const Message = new Lang.Class({
 
         if (keysym == Clutter.KEY_Delete ||
             keysym == Clutter.KEY_KP_Delete) {
-            this.emit('close');
+            this.close();
             return Clutter.EVENT_STOP;
         }
         return Clutter.EVENT_PROPAGATE;